merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 26 May 2006 19:41:49 +0000 (13:41 -0600)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 26 May 2006 19:41:49 +0000 (13:41 -0600)

Trivial merge